Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add Era_Run3_2024, Era_Run3_2025, Tier0 reco scenario for 2024, and change default era in PyReleaseValidation #43761

Merged
merged 3 commits into from
Jun 12, 2024

Conversation

mmusich
Copy link
Contributor

@mmusich mmusich commented Jan 20, 2024

PR description:

In response to #43756, following #41271 (comment):

  • add Era_Run3_2024, Era_Run3_2025 (currently straight copies of Run3)
  • add Tier0 reco scenario for 2024
  • change default era in PyReleaseValidation for 2024 MC workflows

PR validation:

  • runTheMatrix.py --what upgrade -l 12824.0 runs fine
  • scram b runtests runs fine:
Creating test log file logs/el9_amd64_gcc12/testing.log
Pass    2s ... Configuration/DataProcessing/TestConfigDP_1
Pass   14s ... Configuration/DataProcessing/TestConfigDP_10
Pass   12s ... Configuration/DataProcessing/TestConfigDP_11
Pass  150s ... Configuration/DataProcessing/TestConfigDP_12
Pass  131s ... Configuration/DataProcessing/TestConfigDP_2
Pass   24s ... Configuration/DataProcessing/TestConfigDP_3
Pass   33s ... Configuration/DataProcessing/TestConfigDP_4
Pass  273s ... Configuration/DataProcessing/TestConfigDP_5
Pass   98s ... Configuration/DataProcessing/TestConfigDP_6
Pass  155s ... Configuration/DataProcessing/TestConfigDP_7
Pass  228s ... Configuration/DataProcessing/TestConfigDP_8
Pass   11s ... Configuration/DataProcessing/TestConfigDP_9
Pass    1s ... Configuration/PyReleaseValidation/test-das-selected-lumis
Pass  175s ... Configuration/PyReleaseValidation/test-runTheMatrix-interactive

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

N/A

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 20, 2024

cms-bot internal usage

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @mmusich (Marco Musich) for master.

It involves the following packages:

  • Configuration/DataProcessing (operations)
  • Configuration/Eras (operations)
  • Configuration/PyReleaseValidation (upgrade, pdmv)
  • Configuration/StandardSequences (operations)

@davidlange6, @miquork, @sunilUIET, @srimanob, @AdrianoDee, @antoniovilela, @fabiocos, @rappoccio, @cmsbuild, @subirsarkar can you please review it and eventually sign? Thanks.
@sameasy, @makortel, @GiacomoSguazzoni, @missirol, @VinInn, @felicepantaleo, @dgulhan, @VourMa, @rovere, @JanFSchulte, @Martin-Grunewald, @fabiocos, @mmusich, @AnnikaStein, @mtosi, @slomeo this is something you requested to watch as well.
@rappoccio, @antoniovilela, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

@@ -2534,7 +2534,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
class UpgradeWorkflow_DDDDB(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
the_era = stepDict[step][k]['--era']
if 'Run3' in the_era and '2023' not in the_era and 'Fast' not in the_era and "Pb" not in the_era:
if 'Run3' in the_era and '2023' not in the_era and '2024' not in the_era and 'Fast' not in the_era and "Pb" not in the_era:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not totally sure to understand what's the intent here, but this line is necessary to avoid having runtime matrix failures. I am wondering if instead of excluding explicitly every "customization" on top of Run3 one should just match exactly Run3 and be done with it (but then I don't understand the purpose of this class).
Perhaps @cms-sw/pdmv-l2 or @cms-sw/upgrade-l2 can clarify.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@srimanob do you have any idea of the usage of this UpgradeWorkflow_DDDDB. Sincerely I don't know/remember.

Copy link
Contributor

@srimanob srimanob Feb 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to use DDD from DB, see
https://github.com/cms-sw/cmssw/blob/master/Configuration/AlCa/python/autoCondModifiers.py#L34-L75

It was invented when we move DDD to DD4hep, but we wanted to keep DDD around for 2022. That is why we have not in in several places to avoid failure due to non-existing era. I agree with @mmusich, we can just match exactly.

@mmusich
Copy link
Contributor Author

mmusich commented Jan 21, 2024

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ddf07d/36952/summary.html
COMMIT: dffa7fb
CMSSW: CMSSW_14_0_X_2024-01-20-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/43761/36952/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 48
  • DQMHistoTests: Total histograms compared: 3247526
  • DQMHistoTests: Total failures: 3
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3247501
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
  • Checked 200 log files, 161 edm output root files, 48 DQM output files
  • TriggerResults: no differences found

@@ -95,6 +95,11 @@ def customisePostEra_Run3_2023(process):
customisePostEra_Run3(process)
return process

def customisePostEra_Run3_2024(process):
#start with a repeat of 2023
customisePostEra_Run3_2023(process)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe here could be a repeat of Run3 instead, with customizePostEra_Run3? This way it would not call the run3_egamma_2023 modifier. Would it make sense?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This way it would not call the run3_egamma_2023 modifier.

This is not the way to not call it. These are just copies of copies from Run-2.
If you want to avoid calling run3_egamma_2023 it needs to be done in the era definition itself (though it defies somewhat the purpose of the PR).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in the last push, since there is still interest in something similar for #44970

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ddf07d/39464/summary.html
COMMIT: 880ab43
CMSSW: CMSSW_14_1_X_2024-05-21-2300/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/43761/39464/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

@vlimant
Copy link
Contributor

vlimant commented May 31, 2024

if there are no objections, I think we should move this forward ASAP do that #44970 can be added for data taking

@mmusich
Copy link
Contributor Author

mmusich commented May 31, 2024

@cms-sw/pdmv-l2 @cms-sw/upgrade-l2 can you please have a look and comment if this update is acceptable on your side?

@srimanob
Copy link
Contributor

+Upgrade

@AdrianoDee
Copy link
Contributor

+pdmv

@mmusich
Copy link
Contributor Author

mmusich commented Jun 5, 2024

@cms-sw/orp-l2 kind ping on this PR

@vlimant
Copy link
Contributor

vlimant commented Jun 10, 2024

ping @cms-sw/orp-l2

@rappoccio
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will be automatically merged.

@cmsbuild cmsbuild merged commit 00b743f into cms-sw:master Jun 12, 2024
11 checks passed
@mmusich mmusich deleted the mm_dev_add_Era2024_2025 branch June 12, 2024 06:33
@patinkaew
Copy link
Contributor

Hi @mmusich, do we have a backport of this to CMSSW14_0_X?

@mmusich
Copy link
Contributor Author

mmusich commented Jun 24, 2024

@patinkaew

do we have a backport of this to CMSSW14_0_X?

here it is #45291, thanks for the reminder (I had actually prepared the branch some time ago).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants